Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Mon, 15 Mar 2010 08:18:20 +0000 (09:18 +0100)
committerJan D. <jan.h.d@swipnet.se>
Mon, 15 Mar 2010 08:18:20 +0000 (09:18 +0100)
commit79ff76b5e5f3a5fe0e0bce63cc1ab478b2c91306
treea76a29d1beea05310068884f33bd009a3f680a6e
parent5e79a54b3227b1bb81d367bd6a4e80d296c61eaa
parent55eabc49645677a3eb5f68146e4211fc9502fd5e
Merge from trunk